From 4b71ed3f5e098595577b866a7698d6b5efab34f4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 13 Mar 2020 15:34:54 -0400
Subject: [PATCH] testsuite: Update tools tests

These tests need to test GTK4 ui file syntax.
---
 testsuite/tools/simplify-data/test1.expected |  5 ++---
 testsuite/tools/simplify-data/test2.expected |  2 +-
 testsuite/tools/simplify-data/test3.expected |  2 +-
 testsuite/tools/simplify-data/test4.expected |  4 ++--
 testsuite/tools/simplify-data/test4.ui       |  2 +-
 testsuite/tools/simplify-data/test5.expected |  5 ++++-
 testsuite/tools/simplify-data/test5.ui       |  2 +-
 testsuite/tools/simplify-data/test6.expected |  3 ++-
 testsuite/tools/simplify-data/test6.ui       |  1 +
 testsuite/tools/simplify-data/test7.expected | 10 +++++++---
 testsuite/tools/simplify-data/test7.ui       | 11 ++++++-----
 testsuite/tools/simplify-data/test8.expected | 11 -----------
 testsuite/tools/simplify-data/test8.ui       | 12 ------------
 testsuite/tools/simplify-data/test9.expected | 13 -------------
 testsuite/tools/simplify-data/test9.ui       | 13 -------------
 15 files changed, 28 insertions(+), 68 deletions(-)
 delete mode 100644 testsuite/tools/simplify-data/test8.expected
 delete mode 100644 testsuite/tools/simplify-data/test8.ui
 delete mode 100644 testsuite/tools/simplify-data/test9.expected
 delete mode 100644 testsuite/tools/simplify-data/test9.ui

diff --git a/testsuite/tools/simplify-data/test1.expected b/testsuite/tools/simplify-data/test1.expected
index de1472e5cd..23509c8237 100644
--- a/testsuite/tools/simplify-data/test1.expected
+++ b/testsuite/tools/simplify-data/test1.expected
@@ -1,5 +1,4 @@
-<!-- default property gets stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <object class="GtkWindow">
-  </object>
+  <object class="GtkWindow"/>
 </interface>
diff --git a/testsuite/tools/simplify-data/test2.expected b/testsuite/tools/simplify-data/test2.expected
index 99fefb9511..0bb3f4e18b 100644
--- a/testsuite/tools/simplify-data/test2.expected
+++ b/testsuite/tools/simplify-data/test2.expected
@@ -1,4 +1,4 @@
-<!-- non-default property not stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
     <property name="visible">1</property>
diff --git a/testsuite/tools/simplify-data/test3.expected b/testsuite/tools/simplify-data/test3.expected
index 6b9c07f163..511e7ee76b 100644
--- a/testsuite/tools/simplify-data/test3.expected
+++ b/testsuite/tools/simplify-data/test3.expected
@@ -1,4 +1,4 @@
-<!-- translatable property not stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
     <property name="visible" translatable="yes">0</property>
diff --git a/testsuite/tools/simplify-data/test4.expected b/testsuite/tools/simplify-data/test4.expected
index 286f1062ec..be8d6b5981 100644
--- a/testsuite/tools/simplify-data/test4.expected
+++ b/testsuite/tools/simplify-data/test4.expected
@@ -1,6 +1,6 @@
-<!-- irrelevant comments and context are stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="visible">1</property>
+    <property name="visible" comments="foo" context="bla">1</property>
   </object>
 </interface>
diff --git a/testsuite/tools/simplify-data/test4.ui b/testsuite/tools/simplify-data/test4.ui
index eb5b0f0ea6..cf9c66b091 100644
--- a/testsuite/tools/simplify-data/test4.ui
+++ b/testsuite/tools/simplify-data/test4.ui
@@ -1,4 +1,4 @@
-<!-- irrelevant comments and context are stripped -->
+<!-- comments and context are preserved -->
 <interface>
   <object class="GtkWindow">
     <property name="visible" comments="foo" context="bla">True</property>
diff --git a/testsuite/tools/simplify-data/test5.expected b/testsuite/tools/simplify-data/test5.expected
index 1fb898bc0e..24b18f4a52 100644
--- a/testsuite/tools/simplify-data/test5.expected
+++ b/testsuite/tools/simplify-data/test5.expected
@@ -1,8 +1,11 @@
-<!-- placeholders are stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
     <child>
       <object class="GtkBox">
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>
diff --git a/testsuite/tools/simplify-data/test5.ui b/testsuite/tools/simplify-data/test5.ui
index e379abdb2c..66ccb2016b 100644
--- a/testsuite/tools/simplify-data/test5.ui
+++ b/testsuite/tools/simplify-data/test5.ui
@@ -1,4 +1,4 @@
-<!-- placeholders are stripped -->
+<!-- placeholders are preserved -->
 <interface>
   <object class="GtkWindow">
     <child>
diff --git a/testsuite/tools/simplify-data/test6.expected b/testsuite/tools/simplify-data/test6.expected
index 8d4495b50e..3ee19043ff 100644
--- a/testsuite/tools/simplify-data/test6.expected
+++ b/testsuite/tools/simplify-data/test6.expected
@@ -1,5 +1,6 @@
-<!-- non-canonical property name works -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
+    <property name="default_height">200</property>
   </object>
 </interface>
diff --git a/testsuite/tools/simplify-data/test6.ui b/testsuite/tools/simplify-data/test6.ui
index e4f394dc21..c0a5673f10 100644
--- a/testsuite/tools/simplify-data/test6.ui
+++ b/testsuite/tools/simplify-data/test6.ui
@@ -2,5 +2,6 @@
 <interface>
   <object class="GtkWindow">
     <property name="default_width">-1</property>
+    <property name="default_height">200</property>
   </object>
 </interface>
diff --git a/testsuite/tools/simplify-data/test7.expected b/testsuite/tools/simplify-data/test7.expected
index a75c4d4570..22f627bfa8 100644
--- a/testsuite/tools/simplify-data/test7.expected
+++ b/testsuite/tools/simplify-data/test7.expected
@@ -1,8 +1,12 @@
-<!-- default child property gets stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <object class="GtkBox">
+  <object class="GtkGrid">
     <child>
-      <object class="GtkLabel"/>
+      <object class="GtkLabel">
+        <layout>
+          <property name="row-span">2</property>
+        </layout>
+      </object>
     </child>
   </object>
 </interface>
diff --git a/testsuite/tools/simplify-data/test7.ui b/testsuite/tools/simplify-data/test7.ui
index 52e0da2f4b..2b08eae6ad 100644
--- a/testsuite/tools/simplify-data/test7.ui
+++ b/testsuite/tools/simplify-data/test7.ui
@@ -1,12 +1,13 @@
-<!-- default child property gets stripped -->
+<!-- default layout property gets stripped -->
 <interface>
-  <object class="GtkBox">
+  <object class="GtkGrid">
     <child>
       <object class="GtkLabel">
+        <layout>
+          <property name="column-span">1</property>
+          <property name="row-span">2</property>
+        </layout>
       </object>
-      <packing>
-        <property name="expand">False</property>
-      </packing>
     </child>
   </object>
 </interface>
diff --git a/testsuite/tools/simplify-data/test8.expected b/testsuite/tools/simplify-data/test8.expected
deleted file mode 100644
index df3c4077e3..0000000000
--- a/testsuite/tools/simplify-data/test8.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- non-default child property remains -->
-<interface>
-  <object class="GtkBox">
-    <child>
-      <object class="GtkLabel"/>
-      <packing>
-        <property name="expand">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/testsuite/tools/simplify-data/test8.ui b/testsuite/tools/simplify-data/test8.ui
deleted file mode 100644
index 1aec7adfea..0000000000
--- a/testsuite/tools/simplify-data/test8.ui
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- non-default child property remains -->
-<interface>
-  <object class="GtkBox">
-    <child>
-      <object class="GtkLabel">
-      </object>
-      <packing>
-        <property name="expand">True</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/testsuite/tools/simplify-data/test9.expected b/testsuite/tools/simplify-data/test9.expected
deleted file mode 100644
index 731b05e586..0000000000
--- a/testsuite/tools/simplify-data/test9.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkGrid">
-    <child>
-      <object class="GtkLabel">
-        <layout>
-          <property name="left-attach">0</property>
-          <property name="top-attach">0</property>
-        </layout>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/testsuite/tools/simplify-data/test9.ui b/testsuite/tools/simplify-data/test9.ui
deleted file mode 100644
index b64bf8c463..0000000000
--- a/testsuite/tools/simplify-data/test9.ui
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- non-default child property remains -->
-<interface>
-  <object class="GtkGrid">
-    <child>
-      <object class="GtkLabel">
-        <layout>
-          <property name="left-attach">0</property>
-          <property name="top-attach">0</property>
-        </layout>
-      </object>
-    </child>
-  </object>
-</interface>
-- 
2.30.2